From 47c6e7f28ddc27f194c7c4902ea3163ba582b582 Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Wed, 12 Nov 2014 17:31:33 +0000 Subject: [PATCH] xl: Return proper error codes for block-attach and block-detach Return proper error codes on failure so that scripts can tell whether the command completed properly or not. This is not a proper fix, since it fails to call libxl_device_disk_dispose() on the error path. But a proper fix requires some refactoring, so given where we are in the release process, it's better to have a fix that is simple and obvious, and do the refactoring once the next development window opens up. Signed-off-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9afef3fe05..0e754e70bc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6383,6 +6383,7 @@ int main_blockattach(int argc, char **argv) if (libxl_device_disk_add(ctx, fe_domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); + return 1; } return 0; } @@ -6444,6 +6445,7 @@ int main_blockdetach(int argc, char **argv) rc = libxl_device_disk_remove(ctx, domid, &disk, 0); if (rc) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); + return 1; } libxl_device_disk_dispose(&disk); return rc; -- 2.30.2